From 88ef199ed713412a1825942f2929d382bf0b05f4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 5 Oct 2010 16:11:49 -0400
Subject: [PATCH] Inclusion cleanups in headers

---
 gdk/gdkmain.h              |  1 -
 gdk/gdkrectangle.h         |  2 ++
 gdk/gdkscreen.h            |  4 ++--
 gdk/gdkthreads.h           |  2 ++
 gdk/x11/gdkasync.h         |  2 +-
 gdk/x11/gdkdevice-xi2.h    |  1 +
 gdk/x11/gdkdisplay-x11.h   |  7 +++----
 gdk/x11/gdkdrawable-x11.h  |  1 -
 gdk/x11/gdkprivate-x11.h   | 10 ++++------
 gdk/x11/gdkscreen-x11.h    |  4 ++--
 gdk/x11/gdkx.h             |  1 -
 gdk/x11/xsettings-common.h |  2 ++
 12 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index 1b36440780..f2ceaaa4bf 100644
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -31,7 +31,6 @@
 #ifndef __GDK_MAIN_H__
 #define __GDK_MAIN_H__
 
-#include <glib.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h
index de72b29f2d..9555457d4c 100644
--- a/gdk/gdkrectangle.h
+++ b/gdk/gdkrectangle.h
@@ -31,6 +31,8 @@
 #ifndef __GDK_RECTANGLE_H__
 #define __GDK_RECTANGLE_H__
 
+#include <gdk/gdktypes.h>
+
 G_BEGIN_DECLS
 
 /* Rectangle utilities
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 9e1e606e8d..4b27e6034f 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -29,8 +29,8 @@
 #define __GDK_SCREEN_H__
 
 #include <cairo.h>
-#include "gdk/gdktypes.h"
-#include "gdk/gdkdisplay.h"
+#include <gdk/gdktypes.h>
+#include <gdk/gdkdisplay.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkthreads.h b/gdk/gdkthreads.h
index 9b2517173f..743e6ec6fa 100644
--- a/gdk/gdkthreads.h
+++ b/gdk/gdkthreads.h
@@ -31,6 +31,8 @@
 #ifndef __GDK_THREADS_H__
 #define __GDK_THREADS_H__
 
+#include <gdk/gdktypes.h>
+
 G_BEGIN_DECLS
 
 void     gdk_threads_init                     (void);
diff --git a/gdk/x11/gdkasync.h b/gdk/x11/gdkasync.h
index 44aa18c47c..eebea396a6 100644
--- a/gdk/x11/gdkasync.h
+++ b/gdk/x11/gdkasync.h
@@ -21,8 +21,8 @@
 #ifndef __GDK_ASYNC_H__
 #define __GDK_ASYNC_H__
 
+#include <gdk/gdkdisplay.h>
 #include <X11/Xlib.h>
-#include "gdk.h"
 
 G_BEGIN_DECLS
 
diff --git a/gdk/x11/gdkdevice-xi2.h b/gdk/x11/gdkdevice-xi2.h
index 67e4dc940a..2fa3064744 100644
--- a/gdk/x11/gdkdevice-xi2.h
+++ b/gdk/x11/gdkdevice-xi2.h
@@ -21,6 +21,7 @@
 #define __GDK_DEVICE_XI2_H__
 
 #include <gdk/gdkdeviceprivate.h>
+#include <X11/extensions/XInput2.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index b4036cb591..9ac0c3ae02 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -24,14 +24,13 @@
 #ifndef __GDK_DISPLAY_X11__
 #define __GDK_DISPLAY_X11__
 
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <glib.h>
 #include <gdk/gdkdisplay.h>
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkwindow.h>
 #include <gdk/gdkinternals.h>
-#include <gdk/gdk.h>		/* For gdk_get_program_class() */
+#include <gdk/gdkmain.h>
+#include <X11/X.h>
+#include <X11/Xlib.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
index 16c8953332..e197766cba 100644
--- a/gdk/x11/gdkdrawable-x11.h
+++ b/gdk/x11/gdkdrawable-x11.h
@@ -28,7 +28,6 @@
 #define __GDK_DRAWABLE_X11_H__
 
 #include <gdk/gdkdrawable.h>
-
 #include <X11/Xlib.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 67e1c37148..bfcf1e38f8 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -31,14 +31,12 @@
 #ifndef __GDK_PRIVATE_X11_H__
 #define __GDK_PRIVATE_X11_H__
 
-#include <cairo-xlib.h>
-
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkprivate.h>
-#include <gdk/x11/gdkwindow-x11.h>
-#include <gdk/x11/gdkdisplay-x11.h>
-
-#include "gdk/gdkinternals.h"
+#include <gdk/gdkinternals.h>
+#include "gdkwindow-x11.h"
+#include "gdkdisplay-x11.h"
+#include <cairo-xlib.h>
 
 typedef struct _GdkCursorPrivate       GdkCursorPrivate;
 
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index 07fec614a3..72c0ead900 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -24,10 +24,10 @@
 #ifndef __GDK_SCREEN_X11_H__
 #define __GDK_SCREEN_X11_H__
 
-#include "gdkprivate-x11.h"
-#include "xsettings-client.h"
 #include <gdk/gdkscreen.h>
 #include <gdk/gdkvisual.h>
+#include "gdkprivate-x11.h"
+#include "xsettings-client.h"
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index a0cc7dd36a..b9f91a8877 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -28,7 +28,6 @@
 #define __GDK_X_H__
 
 #include <gdk/gdkprivate.h>
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
diff --git a/gdk/x11/xsettings-common.h b/gdk/x11/xsettings-common.h
index 1479f299ad..de7367a6c2 100644
--- a/gdk/x11/xsettings-common.h
+++ b/gdk/x11/xsettings-common.h
@@ -23,6 +23,8 @@
 #ifndef XSETTINGS_COMMON_H
 #define XSETTINGS_COMMON_H
 
+#include <unistd.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
-- 
2.30.2